From: Glenn Morris <rgm@gnu.org>
Date: Wed, 18 Feb 2009 04:34:43 +0000 (+0000)
Subject: (unrmail): Use mail-mbox-from.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1724
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1ff0360f73c1720ee44dcfa4e2fedca96f3f7348;p=emacs.git

(unrmail): Use mail-mbox-from.
---

diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 86957813e1e..bb73b82c9ef 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -43,7 +43,7 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
     (message "Done")
     (kill-emacs (if error 1 0))))
 
-(declare-function mail-strip-quoted-names "mail-utils" (address))
+(declare-function mail-mbox-from "mail-utils" ())
 (defvar rmime-magic-string)		; in rmime.el, if you have it
 
 ;;;###autoload
@@ -191,22 +191,8 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
 	       (save-excursion (search-forward "\n\n" nil 'move) (point)))
 
 	      ;; Fetch or construct what we should use in the `From ' line.
-	      (setq mail-from
-		    (or (mail-fetch-field "Mail-From")
-			(concat "From "
-				(mail-strip-quoted-names
-				 (or (mail-fetch-field "from")
-				     (mail-fetch-field "really-from")
-				     (mail-fetch-field "sender")
-				     "unknown"))
-				"  "
-				(let ((date (mail-fetch-field "date")))
-				  (or
-				   (and date
-					(ignore-errors
-					 (current-time-string
-					  (date-to-time date))))
-				   (current-time-string))))))
+	      (setq mail-from (or (mail-fetch-field "Mail-From")
+				  (mail-mbox-from)))
 
 	      ;; If the message specifies a coding system, use it.
 	      (let ((maybe-coding (mail-fetch-field "X-Coding-System")))